merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Wed, 20 Jun 2007 18:49:27 +0000 (12:49 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 20 Jun 2007 18:49:27 +0000 (12:49 -0600)

Trivial merge